From: Richard M. Stallman <rms@gnu.org>
Date: Thu, 8 Jul 1993 03:04:52 +0000 (+0000)
Subject: (file-relative-name): If we use default-directory,
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~95030
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=77fb6aed82fed34237e6f52c8f65b0641010ca2c;p=emacs.git

(file-relative-name): If we use default-directory,
call expand-file-name anyway.
---

diff --git a/lisp/files.el b/lisp/files.el
index 62210737189..38fc1fc3cdf 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -1321,9 +1321,8 @@ Value is a list whose car is the name for the backup file
 (defun file-relative-name (filename &optional directory)
   "Convert FILENAME to be relative to DIRECTORY (default: default-directory)."
   (setq filename (expand-file-name filename)
-	directory (file-name-as-directory (if directory
-					      (expand-file-name directory)
-					      default-directory)))
+	directory (file-name-as-directory (expand-file-name
+					   (or directory default-directory))))
   (file-relative-name-1 directory))
 
 (defun save-buffer (&optional args)